Remove conflict markers.
authorJuanma Barranquero <lekktu@gmail.com>
Sat, 24 Apr 2010 12:33:31 +0000 (14:33 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Sat, 24 Apr 2010 12:33:31 +0000 (14:33 +0200)
commita9e688b357dadf201708d1a7ac17ee334dbd0857
tree74b696bf926a9de4b6988174795780602aee00a3
parent648f709768d11fb69114d1bc985b8cc014fcee98
Remove conflict markers.
src/ChangeLog